cancel the expand collapse timeout when unsetting the model (Fixes

2006-06-27  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_set_model): cancel the
	expand collapse timeout when unsetting the model (Fixes #327164,
	reported by Daichi Kawahata).

diff --git a/ChangeLog b/ChangeLog
index c3f6448021467bd15827060bf1b505653c7a7278..de5864d4d4818f66dc44ba1f42b6c371542edc12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-27  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): cancel the
+       expand collapse timeout when unsetting the model (Fixes #327164,
+       reported by Daichi Kawahata).
+
 2006-06-26  Michael Emmel  <mike.emmel@gmail.com>
        
        * gdk/directfb/gdkdirectfb.h: added ifdef to compile with directfb 0.9.24 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c3f6448021467bd15827060bf1b505653c7a7278..de5864d4d4818f66dc44ba1f42b6c371542edc12 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-06-27  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): cancel the
+       expand collapse timeout when unsetting the model (Fixes #327164,
+       reported by Daichi Kawahata).
+
 2006-06-26  Michael Emmel  <mike.emmel@gmail.com>
        
        * gdk/directfb/gdkdirectfb.h: added ifdef to compile with directfb 0.9.24 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index cf4be7fce0ad4a9d72da6745085a47c5fcce83f3..c8c3e49a37b725a842df89a5f7e17830c12ecf44 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10399,6 +10399,12 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
       gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
       gtk_tree_view_stop_editing (tree_view, TRUE);
 
+      if (tree_view->priv->expand_collapse_timeout)
+        {
+          g_source_remove (tree_view->priv->expand_collapse_timeout);
+          tree_view->priv->expand_collapse_timeout = 0;
+       }
+
       g_signal_handlers_disconnect_by_func (tree_view->priv->model,
                                            gtk_tree_view_row_changed,
                                            tree_view);